Skip to content
This repository has been archived by the owner on Sep 24, 2021. It is now read-only.

Make default cpu and memory configurable #152

Merged
merged 1 commit into from
May 25, 2017

Conversation

feiskyer
Copy link
Contributor

In some cases, the default 64MB memory is not sufficient. This PR makes the default cpu and memory configurable.

It should help with rook.io (#151) with setting default memory to 512MB.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 24, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@@ -58,6 +58,8 @@ var (
enableAlternativeRuntime = pflag.Bool("enable-alternative-runtime", true, "Enable alternative runtime to handle OS containers, default is true")
cgroupDriver = pflag.String("cgroup-driver", "cgroupfs", "Driver that the frakti uses to manipulate cgroups on the host. *SHOULD BE SAME AS* kubelet cgroup driver configuration. Possible values: 'cgroupfs', 'systemd'")
rootDir = pflag.String("root-directory", "/var/lib/frakti", "Path to the frakti root directory")
defaultCPUNum = pflag.Int("cpu", 1, "Default CPU number for HyperVM when cpu is not specified for the pod")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it worth to say cpu limit and memory limit here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep

@@ -58,6 +58,8 @@ var (
enableAlternativeRuntime = pflag.Bool("enable-alternative-runtime", true, "Enable alternative runtime to handle OS containers, default is true")
cgroupDriver = pflag.String("cgroup-driver", "cgroupfs", "Driver that the frakti uses to manipulate cgroups on the host. *SHOULD BE SAME AS* kubelet cgroup driver configuration. Possible values: 'cgroupfs', 'systemd'")
rootDir = pflag.String("root-directory", "/var/lib/frakti", "Path to the frakti root directory")
defaultCPUNum = pflag.Int("cpu-limit", 1, "Default CPU limit in number for HyperVM when cpu is not specified for the pod")
Copy link
Contributor

@resouer resouer May 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean: Default CPU in number for HyperVM when cpu limit is not specified for the pod. Because there's also cpu request in k8s, which frakti do not care.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack

Copy link
Contributor

@resouer resouer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@resouer resouer merged commit 0ce3be7 into kubernetes-retired:master May 25, 2017
@feiskyer feiskyer deleted the default-limits branch May 25, 2017 03:17
resouer pushed a commit that referenced this pull request May 25, 2017
This was referenced Jun 28, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants